Add some missing braces

svn path=/trunk/; revision=21005

diff --git a/ChangeLog b/ChangeLog
index d22b812ba3ed8f3fee3893bcac95d24f856afb59..f8be3d0319ac733a92cd9ada1fc994562ca8634e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 545982 – missing braces cause bogus warnings when using GtkBuilder
+
+       * gtk/gtkcelllayout.c:
+       * gtk/gtkdialog.c:
+       * gtk/gtkcontainer.c: Add missing braces to some GtkBuildable
+       implementations. Patch by Antti Kaijanmäki
+
 2008-08-05  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtktext.c: Cast pointer to gintptr instead of gulong to

diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index c0f54f2676594d7149cf363fec74665e458e454e..2783ce8b506edb4a215c3415c242d91738033284 100644 (file)
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -330,9 +330,11 @@ attributes_start_element (GMarkupParseContext *context,
   guint i;
 
   if (strcmp (element_name, "attribute") == 0)
-    for (i = 0; names[i]; i++)
-      if (strcmp (names[i], "name") == 0)
-       parser_data->attr_name = g_strdup (values[i]);
+    {
+      for (i = 0; names[i]; i++)
+       if (strcmp (names[i], "name") == 0)
+         parser_data->attr_name = g_strdup (values[i]);
+    }
   else if (strcmp (element_name, "attributes") == 0)
     return;
   else

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4a82b3ea10329c28e5c448cb7f8a781243790973..ddaee28f14412a32a245c3803e61a3d17d82bc39 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -367,9 +367,11 @@ attributes_start_element (GMarkupParseContext *context,
   guint i;
 
   if (strcmp (element_name, "property") == 0)
-    for (i = 0; names[i]; i++)
-      if (strcmp (names[i], "name") == 0)
-       parser_data->child_prop_name = g_strdup (values[i]);
+    {
+      for (i = 0; names[i]; i++)
+       if (strcmp (names[i], "name") == 0)
+         parser_data->child_prop_name = g_strdup (values[i]);
+    }
   else if (strcmp (element_name, "packing") == 0)
     return;
   else

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 94aaeb3bd3241c68d69f9963972a0592e5ac3d88..7f9df320f405ac0fd7df49b083a15ab6af59e36d 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1310,9 +1310,11 @@ attributes_start_element (GMarkupParseContext *context,
   guint i;
 
   if (strcmp (element_name, "action-widget") == 0)
-    for (i = 0; names[i]; i++)
-      if (strcmp (names[i], "response") == 0)
-       parser_data->response = g_strdup (values[i]);
+    {
+      for (i = 0; names[i]; i++)
+       if (strcmp (names[i], "response") == 0)
+         parser_data->response = g_strdup (values[i]);
+    }
   else if (strcmp (element_name, "action-widgets") == 0)
     return;
   else